Reformulate with-clause

This should fix https://bugzilla.redhat.com/show_bug.cgi?id=953195
optimise bookmark message from search result
Merge branch 'patch-1' of https://github.com/adlq/zanata into work
fix test after pull in patch