Revert "Updated preferences in the model to correspond to Rails 4"

This reverts commit d4c07a73a8adb4f0e98c13a0703374994501fa19.
Revert "Check if the order makes difference"

This reverts commit d9f2b65070a0079c375420c60aab98d7a5c04107.
Applied direct states changes