Fixed Search Issues, Added Controls