Slightly more with the advanced search - broken still