added filter by type and sort now works as expected minus estimated value