Refactor for new behavior of FIND queries.

At least one "FIND Test*" pops up when searching here