Added account_spec
Fixed Account queries