add support for all search types
added other missing search / some cleanup