Fixing minor issues with invocing and invoice selection