[entry_count] for search form returns total entries when no entries are found

Hey all,
This is a new issue with a recent Formidable updates.
I created a search form and passed the parameters to a form view. When there is no match, it displays the total entry count plus all the entries. However, when there is a match, it does display the entry count [entry_count] correctly. I have already submitted a support ticket to Formidable and they were able to replicate the issue. In the meantime, does anyone have a good solution to patch this?
Thanks,
Kianush