Performance optmisation

Place limit before scope so it actually gets applied at the SQL
level. Otherwise we query the whole database :-/
Merge branch 'develop-fftf'