Drop Rails 3 support
Add preload_marker query method