more cleanup on search_q -- much simpler now
pre work commit