Advanced Search in place - needs reorganiing and testing