[FIX] collection search text limit, little clean up