Added possibility of conditional queries with pre