search improvement, more tags, case insensitive