Bug Fix: Filter units by criteria before limmiting the result set. Closes #379