Replace query using arel
Add accessor to use bullet