fixed so that account_id might be included in a search condition.
Merge pull request #298 from axsh/feature-alarm

fixed so that account_id might be included in a search condition.