Make MySQL & SQLite queries more robust