making search better and continued with include rule functionality