Refactor queries to match current db names. Create labels for hover/mouseclick functionality.