Added advanched search features