Added user filter to search.  Supporting refactors.