Adding advance search changes