Addresses points 2 and 3 of intermine/intermine#374