fixed spare part filter error
fixed tests
added model params to pagination template to fix exception
merged pagination fix and fixed conflicts
merged and fixed conflicts