Better detection of CONSTRUCT queries

Signed-off-by: Aymeric Brisse <aymeric.brisse@perfect-memory.com>