Added search capabilites with haystack