Added filtering options
Added parsing of extra fields
Added estimate rendering