Fixing filter so that it doesn't read settings everytime it runs, but now only when query is blank.  Huge speed improvement