SQL refactor, MySQLi not ready