add LIKE query on user-query and clean up