Fixing task search to use same logic as form search