Develop

moving fixes from develop into master & part of the search for refset functionality