Fix NPE thrown when selecting certain labor types
Fix bug preventing certain individual list items from refreshing
Fix arg OOR exception when a search would return only one element
Merge remote-tracking branch 'upstream/master'