Fix citation match query construction