Fixed useages of deprecated templatetags