Rest API search tweaks