Feature/389 respect price ranges

@drdla Please review