Fix asterisk queries