enhance query string based search