Improved admin search splitting query U4-2509