add support for entity search and regex search options