Re #945 Modify logic or RIGHTS + REUSABILITY queries.
Re #945 Modify logic or RIGHTS + REUSABILITY queries.