Bugfix: wrong behavior on missing prepared_query option #2