Usersearch overlap

fix for overlap issue  in user search with record__event
The Travis tests were failing on some of the tests that used non-composite queries; fixing that might be as simple as adding an "else: subquery = None" here, but it might not be.  (Specifically try the program printables module test.)