Small cleanup to keep form population searches small