Apply default user limit to search limit box
Code cleanup