fixed database quotes and missing intent flag