improvements to search system
only append to search string if it exists