split pharmacy and lab into separate groups
fixes to list filtering. Closes #48. Closes #54