moved account search to filter to reduce method complexity