fixed the suggestions by limiting on the client side instead of on the server side
Merge branch 'feature/fix-suggestions' into develop
Merge branch 'develop'