Fix bug 3970 - Pressing enter in the filter field reloads page
Fix merge conflict