DATASOLR-86: refactoring of other,include and hardend query creation; update tests