Made citation query more general
ws.php conflict corrected