req update
before merge with main track
search on server side
small changes done via Skype call with Marcin