Feature/club 181 project search

Yes it's the dirty hack after all.