SMS filtering
* merge fix