Fix search for Oracle
Simplify page flow for RDBMS, after unification