changed to auto-detect for # and @

Removing the need for users to define the search type.